Remove conflict markers.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 91d4a8f7e37663804d91aaf794f9510dbb753d5c..84a857187708ad3028a11eddc2fcdacc76a99731 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 16 00:13:19 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/tmpl/gtktreestore.sgml: Remove cvs conflict
+       markers.
+
 Sun Mar 14 22:27:59 2004  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/tmpl/gtktreeview.sgml: Document 

diff --git a/docs/reference/gtk/tmpl/gtktreestore.sgml b/docs/reference/gtk/tmpl/gtktreestore.sgml
index d53f2a95d8d1578b26b65162955549941125f7c5..39832d3b93df2c43dd525a2244a3fba784304ed7 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktreestore.sgml
+++ b/docs/reference/gtk/tmpl/gtktreestore.sgml
@@ -209,10 +209,6 @@ drop</link> interfaces.
 @b: 
 
 
-<<<<<<< gtktreestore.sgml
-=======
-
-
 <!-- ##### FUNCTION gtk_tree_store_move_before ##### -->
 <para>
 
@@ -233,6 +229,3 @@ drop</link> interfaces.
 @position: 
 
 
->>>>>>> 1.16
-
-